Attachement Controller and Update to Query Viewer