Moved elastic search attributes and tidied up