added custom query support
Merge https://github.com/kodas2/YRS13