Yes, this is better. BTW, I saw people writing things like

  fs.id
  ,fs.file_hash

and

  file_name = '.vimrc'
  AND fs.id = ot.file_system_id

which has subtle advantages (such as easier editing).

Also, I cannot bring myself to writing SQL keywords in all caps. It feels ancient. Just a matter of taste.