Finished adding the ability to override the standard items query