Work on Indexed field, fix some details