Search with partial matching, and fix some issues with User Resources