HPSA-118 add validation in query to delete values