Filtering for homepage/feed + Minor cleanups