Some bug fixes, and commented out time filter for now