enhanced query support
cleaned up unused file