Clarifies code with descriptive variable names

Also changes filter description to be more non-developer friendly.
Replaces use of kwargs with Q object