Removing wildcard for font family, added variable for code font family
Initial cut at code completion
Bringing back map changes for backend layer api representation change