Fixed error after table renaming.
Merge branch 'fix_filter_error' into develop