Fixed and combined design/dev to use the same query.