Change to use where clause vs double db hits