LPS-48579 Avoid hitting the db

Please, check and test my changes and submit to Brian