Added loading activity, added more filter, solved minor issue with SQL