Cleaning up annotations and adding a query by name