Filter by categories and QR code
Resolve conflict