NXP-12127: update query to remove unecessary test