Small tweaks
Added aspect calls for queries

Calls now happening before and after with the proper context being
passed