Added filter for interest type and fixed minor bugs