edited extrat filename regex to take into account ?