Switched the implementation of limit from a custom property to use options['limit']. Similar to the way order was implemented.