Merge branch 'master' into 'master'

Rate, type and tag filter conditions should be evaluated outside of the loop

Fix filter. Rating filter was considering rates greater than the selected one