Normalize callbacks/switchbacks in find query
Added some additional error checking.