Added saving of flatId to crawler, few clearing modifications before merging to master.