fixed query browser
Merge branch 'kahlil'
Removed attributes as field of table and added lookup instead