Content handler now supports custom queries
Removed reference handler (as it can be done with content)