handle numbers as queries
dockerize
some config test cleanup