fixed form filling with loader/content provider
added implementation for extra filling fields