refactored CDR and fixed location caledae filter
small changes [time: 3.5]