Add support for limit query arg