batch the other HQL queries and fix indent
fix NPE with fileset-less images