Item fixes for ES-452, ES-417, ES-453
Merge branch 'master' of https://github.com/globeestate11/estate