edit db query 
hot fix