fix is loading if error
fixing search results loading
Merge remote-tracking branch 'upstream/master' into is-loading
merging
results is loading
merging
merging properly
fix results
fixing activity controller
activity type
adding tests
fixing comments
Merge branch 'is-loading' into transaction-filtering