Added services and filters javascript file + bug fixes