Fix metadata field focus issue - close #3