Fix for limiting by fields using the new hook