Fixes #746 - Use subqueries to properly filter out Skus when searching