another sneak peek of issue #60, moved some functions of filtering to session_db