LPS-34284 Removed extra indexing from user services