Change URL construction and add filter list