Allow regexp assignement for states and locations
Extra debug logs for files collection
Fix files collection