rename favorite to eingabe, cleanup markup id's