improve nordrassil & grocery-crud