Optimized Customer queries, added filtering