Working on Office entry
Removed unwanted filtering of query
Office Entry is working now