Filter on short_path instead (some might not have a prefix...) and also remove created_at