bug fixes + filtering fixes + initial data load fixes