[Console] Fix autocomplete functionality after 9d94fc7a49b15472b49b201c7e201f2a005ee41a & and little CS adjustments