altered query to match markup