Revamp of Macro Query Finder Application