Refactored Resource full-text search