reworked current place markup