Store dialog improvement. Some fixes