add ability to select custom one-off query
rename query to rand