In Progress: Added faceting functionality