DNN-5192 Improve Edit Page Performance - Unneccessary DB Calls