improved queries for explorer
clean up