fixed and clean query values